From c182c7be6589ad19958a76596b2d215fb6017ec3 Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Mon, 4 Apr 2011 22:46:24 -0500 Subject: [PATCH] Remove files that appear to be incompatible with the DFSG. Files that appear to be incompatible with the DFSG have been removed. A number of files have been removed from this package because their licenses are not compatible with the Debian Free Software Guidelines (DFSG), or because it wasn't completely clear that their licenses are compatible. In particular, all of the files which are covered under the GFDL and have invariant sections have been removed in accordance with this General Resolution: http://www.debian.org/vote/2006/vote_001. The files that have been removed, but still appear to be distributable, have been moved to packages in Debian's non-free section. Author: Rob Browning Added-by: Rob Browning Status: new --- Makefile.in | 30 +-- configure.in | 4 +- doc/misc/Makefile.in | 490 +------------------------------------------ lisp/help.el | 10 +- 4 files changed, 16 insertions(+), 518 deletions(-) diff --git a/Makefile.in b/Makefile.in index 32a09ff7842..41cf979de15 100644 --- a/Makefile.in +++ b/Makefile.in @@ -139,12 +139,7 @@ MAN_PAGES=b2m.1 ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ # since there are now many packages documented with the texinfo # system, it is inappropriate to imply that it is part of Emacs. infodir=@infodir@ -INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \ - ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \ - eshell eudc flymake forms gnus idlwave info mairix-el \ - message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \ - reftex remember sasl sc semantic ses sieve smtpmail speedbar \ - tramp url vip viper widget woman +INFO_FILES=efaq # Directory for local state files for all programs. localstatedir=@localstatedir@ @@ -270,7 +265,7 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'` SUBDIR = lib-src src lisp # The subdir makefiles created by config.status. -SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile +SUBDIR_MAKEFILES = lib-src/Makefile doc/misc/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile # Subdirectories to install, and where they'll go. # lib-src's makefile knows how to install it, so we don't do that here. @@ -357,10 +352,7 @@ Makefile: config.status $(srcdir)/src/config.in \ $(srcdir)/Makefile.in \ $(srcdir)/src/Makefile.in \ $(srcdir)/lib-src/Makefile.in \ - $(srcdir)/doc/emacs/Makefile.in \ $(srcdir)/doc/misc/Makefile.in \ - $(srcdir)/doc/lispref/Makefile.in \ - $(srcdir)/doc/lispintro/Makefile.in \ $(srcdir)/oldXMenu/Makefile.in \ $(srcdir)/lwlib/Makefile.in \ $(srcdir)/leim/Makefile.in \ @@ -701,10 +693,7 @@ mostlyclean: FRC (cd oldXMenu; $(MAKE) $(MFLAGS) mostlyclean) (cd lwlib; $(MAKE) $(MFLAGS) mostlyclean) (cd lib-src; $(MAKE) $(MFLAGS) mostlyclean) - -(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean) -(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean) - -(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean) - -(cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean) (cd leim; $(MAKE) $(MFLAGS) mostlyclean) ### `clean' @@ -720,10 +709,7 @@ clean: FRC (cd oldXMenu; $(MAKE) $(MFLAGS) clean) (cd lwlib; $(MAKE) $(MFLAGS) clean) (cd lib-src; $(MAKE) $(MFLAGS) clean) - -(cd doc/emacs && $(MAKE) $(MFLAGS) clean) -(cd doc/misc && $(MAKE) $(MFLAGS) clean) - -(cd doc/lispref && $(MAKE) $(MFLAGS) clean) - -(cd doc/lispintro && $(MAKE) $(MFLAGS) clean) (cd leim; $(MAKE) $(MFLAGS) clean) ### `bootclean' @@ -744,10 +730,7 @@ distclean: FRC (cd oldXMenu; $(MAKE) $(MFLAGS) distclean) (cd lwlib; $(MAKE) $(MFLAGS) distclean) (cd lib-src; $(MAKE) $(MFLAGS) distclean) - (cd doc/emacs && $(MAKE) $(MFLAGS) distclean) (cd doc/misc && $(MAKE) $(MFLAGS) distclean) - (cd doc/lispref && $(MAKE) $(MFLAGS) distclean) - (cd doc/lispintro && $(MAKE) $(MFLAGS) distclean) (cd leim; $(MAKE) $(MFLAGS) distclean) (cd lisp; $(MAKE) $(MFLAGS) distclean) ${top_distclean} @@ -760,10 +743,7 @@ bootstrap-clean: FRC (cd oldXMenu; $(MAKE) $(MFLAGS) maintainer-clean) (cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean) (cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean) - -(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean) -(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean) - -(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean) - -(cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean) (cd leim; $(MAKE) $(MFLAGS) maintainer-clean) (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean) ${top_bootclean} @@ -808,10 +788,7 @@ dist: .PHONY: info dvi dist check html info-real: - (cd doc/emacs; $(MAKE) $(MFLAGS) info) (cd doc/misc; $(MAKE) $(MFLAGS) info) - (cd doc/lispref; $(MAKE) $(MFLAGS) info) - (cd doc/lispintro; $(MAKE) $(MFLAGS) info) force-info: # Note that man/Makefile knows how to put the info files in $(srcdir), @@ -850,10 +827,7 @@ check-info-dir: info echo "info/dir is OK" dvi: - (cd doc/emacs; $(MAKE) $(MFLAGS) dvi) (cd doc/misc; $(MAKE) $(MFLAGS) dvi) - (cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi) - (cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi) #### Bootstrapping. diff --git a/configure.in b/configure.in index 275e8125ab3..baacfe4c9b1 100644 --- a/configure.in +++ b/configure.in @@ -3118,8 +3118,8 @@ AC_EGREP_CPP(yes..yes, CPP_NEED_TRADITIONAL=yes) AC_OUTPUT(Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile \ - doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ - doc/lispref/Makefile src/Makefile.c:src/Makefile.in \ + doc/misc/Makefile \ + src/Makefile.c:src/Makefile.in \ lwlib/Makefile lisp/Makefile leim/Makefile, [ ### Make the necessary directories, if they don't exist. diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 9e93be4e134..b1dd019ecc5 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -38,104 +38,10 @@ MAKEINFO = makeinfo --force # Also add new entries to INFO_FILES in the top-level Makefile.in. INFO_TARGETS = \ - $(infodir)/ada-mode \ - $(infodir)/auth \ - $(infodir)/autotype \ - $(infodir)/calc \ - $(infodir)/ccmode \ - $(infodir)/cl \ - $(infodir)/dbus \ - $(infodir)/dired-x \ - $(infodir)/ebrowse \ - $(infodir)/ede \ - $(infodir)/ediff \ - $(infodir)/edt \ - $(infodir)/eieio \ - $(infodir)/emacs-mime \ - $(infodir)/epa \ - $(infodir)/erc \ - $(infodir)/eshell \ - $(infodir)/eudc \ - $(infodir)/efaq \ - $(infodir)/flymake \ - $(infodir)/forms \ - $(infodir)/gnus \ - $(infodir)/idlwave \ - $(infodir)/info \ - $(infodir)/mairix-el \ - $(infodir)/message \ - $(infodir)/mh-e \ - $(infodir)/newsticker \ - $(infodir)/nxml-mode \ - $(infodir)/org \ - $(infodir)/pcl-cvs \ - $(infodir)/pgg \ - $(infodir)/rcirc \ - $(infodir)/remember \ - $(infodir)/reftex \ - $(infodir)/sasl \ - $(infodir)/sc \ - $(infodir)/semantic \ - $(infodir)/ses \ - $(infodir)/sieve \ - $(infodir)/smtpmail \ - $(infodir)/speedbar \ - $(infodir)/tramp \ - $(infodir)/url \ - $(infodir)/vip \ - $(infodir)/viper \ - $(infodir)/widget \ - $(infodir)/woman + $(infodir)/efaq DVI_TARGETS = \ - ada-mode.dvi \ - auth.dvi \ - autotype.dvi \ - calc.dvi \ - cc-mode.dvi \ - cl.dvi \ - dbus.dvi \ - dired-x.dvi \ - ebrowse.dvi \ - ede.dvi \ - ediff.dvi \ - edt.dvi \ - eieio.dvi \ - emacs-mime.dvi \ - epa.dvi \ - erc.dvi \ - eshell.dvi \ - eudc.dvi \ - faq.dvi \ - flymake.dvi \ - forms.dvi \ - gnus.dvi \ - idlwave.dvi \ - info.dvi \ - mairix-el.dvi \ - message.dvi \ - mh-e.dvi \ - newsticker.dvi \ - nxml-mode.dvi \ - org.dvi \ - pcl-cvs.dvi \ - pgg.dvi \ - rcirc.dvi \ - reftex.dvi \ - remember.dvi \ - sasl.dvi \ - sc.dvi \ - semantic.dvi \ - ses.dvi \ - sieve.dvi \ - smtpmail.dvi \ - speedbar.dvi \ - tramp.dvi \ - url.dvi \ - vip.dvi \ - viper.dvi \ - widget.dvi \ - woman.dvi + faq.dvi PDF_TARGETS = \ ada-mode.pdf \ @@ -198,10 +104,7 @@ TEXI2PDF = texi2pdf ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" -info: $(infodir) $(INFO_TARGETS) - -$(infodir): - mkdir $@ +info: $(INFO_TARGETS) dvi: $(DVI_TARGETS) @@ -213,150 +116,6 @@ pdf: $(PDF_TARGETS) # In a distribution of Emacs, the Info files should be up to date. ## "short" target names for convenience, to just rebuild one manual. -ada-mode : $(infodir)/ada-mode -$(infodir)/ada-mode: ada-mode.texi - cd $(srcdir); $(MAKEINFO) ada-mode.texi -ada-mode.dvi: ada-mode.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ada-mode.texi -ada-mode.pdf: ada-mode.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ada-mode.texi - -auth : $(infodir)/auth -$(infodir)/auth: auth.texi - cd $(srcdir); $(MAKEINFO) auth.texi -auth.dvi: auth.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/auth.texi -auth.pdf: auth.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/auth.texi - -autotype : $(infodir)/autotype -$(infodir)/autotype: autotype.texi - cd $(srcdir); $(MAKEINFO) autotype.texi -autotype.dvi: autotype.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/autotype.texi -autotype.pdf: autotype.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/autotype.texi - -calc : $(infodir)/calc -$(infodir)/calc: calc.texi - cd $(srcdir); $(MAKEINFO) calc.texi -calc.dvi: calc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/calc.texi -calc.pdf: calc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/calc.texi - -ccmode : $(infodir)/ccmode -$(infodir)/ccmode: cc-mode.texi - cd $(srcdir); $(MAKEINFO) cc-mode.texi -cc-mode.dvi: cc-mode.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/cc-mode.texi -cc-mode.pdf: cc-mode.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/cc-mode.texi - -cl : $(infodir)/cl -$(infodir)/cl: cl.texi - cd $(srcdir); $(MAKEINFO) cl.texi -cl.dvi: cl.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/cl.texi -cl.pdf: cl.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/cl.texi - -dbus : $(infodir)/dbus -$(infodir)/dbus: dbus.texi - cd $(srcdir); $(MAKEINFO) dbus.texi -dbus.dvi: dbus.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/dbus.texi -dbus.pdf: dbus.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/dbus.texi - -dired-x : $(infodir)/dired-x -$(infodir)/dired-x: dired-x.texi - cd $(srcdir); $(MAKEINFO) dired-x.texi -dired-x.dvi: dired-x.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/dired-x.texi -dired-x.pdf: dired-x.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/dired-x.texi - -ebrowse : $(infodir)/ebrowse -$(infodir)/ebrowse: ebrowse.texi - cd $(srcdir); $(MAKEINFO) ebrowse.texi -ebrowse.dvi: ebrowse.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ebrowse.texi -ebrowse.pdf: ebrowse.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ebrowse.texi - -ede : $(infodir)/ede -$(infodir)/ede: ede.texi - cd $(srcdir); $(MAKEINFO) ede.texi -ede.dvi: ede.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ede.texi -ede.pdf: ede.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ede.texi - -ediff : $(infodir)/ediff -$(infodir)/ediff: ediff.texi - cd $(srcdir); $(MAKEINFO) ediff.texi -ediff.dvi: ediff.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ediff.texi -ediff.pdf: ediff.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ediff.texi - -edt : $(infodir)/edt -$(infodir)/edt: edt.texi - cd $(srcdir); $(MAKEINFO) edt.texi -edt.dvi: edt.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/edt.texi -edt.pdf: edt.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/edt.texi - -eieio : $(infodir)/eieio -$(infodir)/eieio: eieio.texi - cd $(srcdir); $(MAKEINFO) eieio.texi -eieio.dvi: eieio.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/eieio.texi -eieio.pdf: eieio.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/eieio.texi - -emacs-mime : $(infodir)/emacs-mime -$(infodir)/emacs-mime: emacs-mime.texi - cd $(srcdir); $(MAKEINFO) --enable-encoding emacs-mime.texi -emacs-mime.dvi: emacs-mime.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/emacs-mime.texi -emacs-mime.pdf: emacs-mime.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/emacs-mime.texi - -epa : $(infodir)/epa -$(infodir)/epa: epa.texi - cd $(srcdir); $(MAKEINFO) epa.texi -epa.dvi: epa.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/epa.texi -epa.pdf: epa.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/epa.texi - -erc : $(infodir)/erc -$(infodir)/erc: erc.texi - cd $(srcdir); $(MAKEINFO) erc.texi -erc.dvi: erc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/erc.texi -erc.pdf: erc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/erc.texi - -eshell : $(infodir)/eshell -$(infodir)/eshell: eshell.texi - cd $(srcdir); $(MAKEINFO) eshell.texi -eshell.dvi: eshell.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/eshell.texi -eshell.pdf: eshell.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/eshell.texi - -eudc : $(infodir)/eudc -$(infodir)/eudc: eudc.texi - cd $(srcdir); $(MAKEINFO) eudc.texi -eudc.dvi: eudc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/eudc.texi -eudc.pdf: eudc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/eudc.texi - efaq : $(infodir)/efaq $(infodir)/efaq: faq.texi cd $(srcdir); $(MAKEINFO) faq.texi @@ -365,249 +124,6 @@ faq.dvi: faq.texi faq.pdf: faq.texi $(ENVADD) $(TEXI2PDF) ${srcdir}/faq.texi -flymake : $(infodir)/flymake -$(infodir)/flymake: flymake.texi - cd $(srcdir); $(MAKEINFO) flymake.texi -flymake.dvi: flymake.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/flymake.texi -flymake.pdf: flymake.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/flymake.texi - -forms : $(infodir)/forms -$(infodir)/forms: forms.texi - cd $(srcdir); $(MAKEINFO) forms.texi -forms.dvi: forms.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/forms.texi -forms.pdf: forms.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi - -# gnus/message/emacs-mime/sieve/pgg are part of Gnus: -gnus : $(infodir)/gnus -$(infodir)/gnus: gnus.texi gnus-faq.texi - cd $(srcdir); $(MAKEINFO) gnus.texi -gnus.dvi: gnus.texi gnus-faq.texi - sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi - $(ENVADD) $(TEXI2DVI) gnustmp.texi - cp gnustmp.dvi $*.dvi - rm gnustmp.* -gnus.pdf: gnus.texi gnus-faq.texi - sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi - $(ENVADD) $(TEXI2PDF) gnustmp.texi - cp gnustmp.pdf $@ - rm gnustmp.* - -# This is produced with --no-split to avoid making files whose -# names clash on DOS 8+3 filesystems -idlwave : $(infodir)/idlwave -$(infodir)/idlwave: idlwave.texi - cd $(srcdir); $(MAKEINFO) --no-split idlwave.texi -idlwave.dvi: idlwave.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/idlwave.texi -idlwave.pdf: idlwave.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/idlwave.texi - -# The following target uses an explicit -o switch to work around -# the @setfilename directive in info.texi, which is required for -# the Texinfo distribution. -###info : $(infodir)/info # circular! -$(infodir)/info: info.texi - cd $(srcdir); $(MAKEINFO) --no-split info.texi -o $@ -info.dvi: info.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/info.texi -info.pdf: info.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/info.texi - -mairix-el : $(infodir)/mairix-el -$(infodir)/mairix-el: mairix-el.texi - cd $(srcdir); $(MAKEINFO) mairix-el.texi -mairix-el.dvi: mairix-el.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/mairix-el.texi -mairix-el.pdf: mairix-el.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/mairix-el.texi - -message : $(infodir)/message -$(infodir)/message: message.texi - cd $(srcdir); $(MAKEINFO) message.texi -message.dvi: message.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/message.texi -message.pdf: message.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/message.texi - -mh-e : $(infodir)/mh-e -$(infodir)/mh-e: mh-e.texi - cd $(srcdir); $(MAKEINFO) mh-e.texi -mh-e.dvi: mh-e.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/mh-e.texi -mh-e.pdf: mh-e.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/mh-e.texi - -newsticker : $(infodir)/newsticker -$(infodir)/newsticker: newsticker.texi - cd $(srcdir); $(MAKEINFO) newsticker.texi -newsticker.dvi: newsticker.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/newsticker.texi -newsticker.pdf: newsticker.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/newsticker.texi - -nxml-mode : $(infodir)/nxml-mode -$(infodir)/nxml-mode: nxml-mode.texi - cd $(srcdir); $(MAKEINFO) nxml-mode.texi -nxml-mode.dvi: nxml-mode.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/nxml-mode.texi -nxml-mode.pdf: nxml-mode.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/nxml-mode.texi - -org : $(infodir)/org -$(infodir)/org: org.texi - cd $(srcdir); $(MAKEINFO) org.texi -org.dvi: org.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/org.texi -org.pdf: org.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/org.texi - -pcl-cvs : $(infodir)/pcl-cvs -$(infodir)/pcl-cvs: pcl-cvs.texi - cd $(srcdir); $(MAKEINFO) pcl-cvs.texi -pcl-cvs.dvi: pcl-cvs.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/pcl-cvs.texi -pcl-cvs.pdf: pcl-cvs.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/pcl-cvs.texi - -pgg : $(infodir)/pgg -$(infodir)/pgg: pgg.texi - cd $(srcdir); $(MAKEINFO) pgg.texi -pgg.dvi: pgg.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/pgg.texi -pgg.pdf: pgg.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/pgg.texi - -rcirc : $(infodir)/rcirc -$(infodir)/rcirc: rcirc.texi - cd $(srcdir); $(MAKEINFO) rcirc.texi -rcirc.dvi: rcirc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/rcirc.texi -rcirc.pdf: rcirc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/rcirc.texi - -reftex : $(infodir)/reftex -$(infodir)/reftex: reftex.texi - cd $(srcdir); $(MAKEINFO) reftex.texi -reftex.dvi: reftex.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/reftex.texi -reftex.pdf: reftex.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/reftex.texi - -remember : $(infodir)/remember -$(infodir)/remember: remember.texi - cd $(srcdir); $(MAKEINFO) remember.texi -remember.dvi: remember.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/remember.texi -remember.pdf: remember.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/remember.texi - -sasl : $(infodir)/sasl -$(infodir)/sasl: sasl.texi - cd $(srcdir); $(MAKEINFO) sasl.texi -sasl.dvi: sasl.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/sasl.texi -sasl.pdf: sasl.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/sasl.texi - -sc : $(infodir)/sc -$(infodir)/sc: sc.texi - cd $(srcdir); $(MAKEINFO) sc.texi -sc.dvi: sc.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/sc.texi -sc.pdf: sc.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/sc.texi - -semantic : $(infodir)/semantic -$(infodir)/semantic: semantic.texi sem-user.texi - cd $(srcdir); $(MAKEINFO) semantic.texi -semantic.dvi: semantic.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/semantic.texi -semantic.pdf: semantic.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/semantic.texi - -ses : $(infodir)/ses -$(infodir)/ses: ses.texi - cd $(srcdir); $(MAKEINFO) ses.texi -ses.dvi: ses.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/ses.texi -ses.pdf: ses.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/ses.texi - -sieve : $(infodir)/sieve -$(infodir)/sieve: sieve.texi - cd $(srcdir); $(MAKEINFO) sieve.texi -sieve.dvi: sieve.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/sieve.texi -sieve.pdf: sieve.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/sieve.texi - -smtpmail : $(infodir)/smtpmail -$(infodir)/smtpmail: smtpmail.texi - cd $(srcdir); $(MAKEINFO) smtpmail.texi -smtpmail.dvi: smtpmail.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/smtpmail.texi -smtpmail.pdf: smtpmail.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/smtpmail.texi - -speedbar : $(infodir)/speedbar -$(infodir)/speedbar: speedbar.texi - cd $(srcdir); $(MAKEINFO) speedbar.texi -speedbar.dvi: speedbar.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/speedbar.texi -speedbar.pdf: speedbar.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/speedbar.texi - -tramp : $(infodir)/tramp -$(infodir)/tramp: tramp.texi trampver.texi - cd $(srcdir); $(MAKEINFO) -D emacs tramp.texi -tramp.dvi: tramp.texi trampver.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/tramp.texi -tramp.pdf: tramp.texi trampver.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/tramp.texi - -url : $(infodir)/url -$(infodir)/url: url.texi - cd $(srcdir); $(MAKEINFO) url.texi -url.dvi: url.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/url.texi -url.pdf: url.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/url.texi - -vip : $(infodir)/vip -$(infodir)/vip: vip.texi - cd $(srcdir); $(MAKEINFO) vip.texi -vip.dvi: vip.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/vip.texi -vip.pdf: vip.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/vip.texi - -viper : $(infodir)/viper -$(infodir)/viper: viper.texi - cd $(srcdir); $(MAKEINFO) viper.texi -viper.dvi: viper.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/viper.texi -viper.pdf: viper.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/viper.texi - -widget : $(infodir)/widget -$(infodir)/widget: widget.texi - cd $(srcdir); $(MAKEINFO) widget.texi -widget.dvi: widget.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/widget.texi -widget.pdf: widget.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/widget.texi - -woman : $(infodir)/woman -$(infodir)/woman: woman.texi - cd $(srcdir); $(MAKEINFO) woman.texi -woman.dvi: woman.texi - $(ENVADD) $(TEXI2DVI) ${srcdir}/woman.texi -woman.pdf: woman.texi - $(ENVADD) $(TEXI2PDF) ${srcdir}/woman.texi mostlyclean: diff --git a/lisp/help.el b/lisp/help.el index 97690ea6b85..482b4a151a9 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -301,6 +301,14 @@ If that doesn't give a function, return nil." (goto-address-mode 1) (goto-char (point-min))) +(defun debian-expand-file-name-dfsg (filename) + "Apply expand-file-name to FILENAME. +If expand-file-name does not find a file, append `.dfsg' and try again." + (let ((file (expand-file-name filename data-directory))) + (if (file-exists-p file) + file + (expand-file-name (concat file ".dfsg") data-directory)))) + (defun describe-distribution () "Display info on how to obtain the latest version of GNU Emacs." (interactive) @@ -314,7 +322,7 @@ If that doesn't give a function, return nil." (defun describe-gnu-project () "Display info on the GNU project." (interactive) - (view-help-file "THE-GNU-PROJECT")) + (view-help-file (debian-expand-file-name-dfsg "THE-GNU-PROJECT"))) (define-obsolete-function-alias 'describe-project 'describe-gnu-project "22.2") -- 2.30.2